Auto merge of #2491 - JIghtuse:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 31 Mar 2016 16:37:48 +0000 (09:37 -0700)
committerbors <bors@rust-lang.org>
Thu, 31 Mar 2016 16:37:48 +0000 (09:37 -0700)
Reject manifest with duplicate dependencies in different targets

Closes #2023


Trivial merge